From: Stef Walter <stefw@gnome.org>
Date: Sat, 9 Mar 2013 10:09:46 +0000 (+0100)
Subject: keyring: Don't replace an already running prompter
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4482
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=805a409318540b40da52c9a2edf3d01669d4d805;p=gnome-shell.git

keyring: Don't replace an already running prompter

 * Prompters have state, and cancelling an already prompter will
   cause prompts that are in progress to fail.
 * In addition allow replacement of our shell prompter for debugging
   purposes.

https://bugzilla.gnome.org/show_bug.cgi?id=695485
---

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index 34d7b6dfd..b38888f5a 100644
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -222,7 +222,7 @@ const KeyringPrompter = new Lang.Class({
     enable: function() {
         this._prompter.register(Gio.DBus.session);
         this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                 Gio.BusNameOwnerFlags.REPLACE, null, null);
+                                                 Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
     },
 
     disable: function() {